Switch license to GPLv3 or later.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1163ec0b49c7a39dce1e9d9920db954168a301d4..86c6edb00b3bb45dcb216417ae8671b402d6978e 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -3620,7 +3620,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/DEBUG b/etc/DEBUG
index ea4e14866ca8e29c2e2a27bfab8ccbed7f6ce562..ca9b08874c0d3e8d24a851f74149072ae86a5bbc 100644 (file)
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -748,7 +748,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/DISTRIB b/etc/DISTRIB
index 33bc767df7957cb364cb86245d022196a1a6a442..945205df29f91ef947861877bea8286120a0aa83 100644 (file)
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -101,7 +101,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index e7b0dcb81bfc4c605a434f386b90f2eabf6d7a65..f5bf1e89ddec2f3b26f5a2546bdda32a8bee6e73 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1089,7 +1089,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index 1ac66899236a3bbd58691c3d0ff931462b12f28b..002747a630a86fde25f5f76821e0b30407fe2682 100644 (file)
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -101,8 +101,8 @@ COPYING PERMISSIONS:
 
     This document is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -110,5 +110,6 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.

diff --git a/etc/ETAGS.README b/etc/ETAGS.README
index aef3aa67f51be24d96295cf074c1c1f7e3c4bcec..e05735f03c1b92e2041df4f54edf651c46488e64 100644 (file)
--- a/etc/ETAGS.README
+++ b/etc/ETAGS.README
@@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,5 +45,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.

diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index d572717485678052b65c882f810cf2b6bd9ef808..fce326fc0d0c2981c2416dab763a41f2603e5017 100644 (file)
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -524,7 +524,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/HELLO b/etc/HELLO
index 8e7b5496c6327239758f2e2246893c4bf34e826d..d803e7944d4d14c1cb9a086e2adef0ed47c8095c 100644 (file)
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -70,7 +70,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/MACHINES b/etc/MACHINES
index 83723fccbbc990f320ddebc92d5700525ff6cde3..a4db1df76c7806cdc78df73d2b3e859491a76ce0 100644 (file)
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1506,7 +1506,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 496f5813b93e6954611b2d93b026d567c57392ff..65ccc760076a86d66a873d8f8c956d4e04dca236 100644 (file)
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3122,7 +3122,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 43ecfd31a62b67588061e78840adc3eb9cbe1a23..bd2a4573bacf5bbc4b776d1502f82d5e3bd6d9b9 100644 (file)
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -284,7 +284,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/Makefile b/etc/Makefile
index 1947147dad774f24213d53d53a59d24896762be6..4608ea2c93de1a88ba04bf116b1d1c55a9039683 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -7,7 +7,7 @@
 
 ## GNU Emacs is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/NEWS b/etc/NEWS
index 1ea5d4e1da4b572f6cb1a81c426c19cdb17100fb..47ac75391227b2b5dd64c4c194ae9c529cf82f55 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5419,7 +5419,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index a69ac834730c610b8c4f00777e13be3abb4a1ec5..4e5243ea0c482c476fdefe1fef6f469f96586071 100644 (file)
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -2515,7 +2515,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/NEWS.18 b/etc/NEWS.18
index d7722f98d0dd05891a03d8fbff3b4f7518e4ee2d..8038e052e7bfd8a367b4cb23b69b22f56e768080 100644 (file)
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1605,7 +1605,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 85414f6f0758882ec07cc24ff665618f1d042d24..2f3e83fb946c040f6c6cdf5a9dd314fe68f8bd5c 100644 (file)
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -6524,7 +6524,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/NEWS.20 b/etc/NEWS.20
index ad101000f16b77b2185eb4c5bb0ed38c09683c23..0c9e7d4948cafd0c1cbc75c84db83c64a84fb9f8 100644 (file)
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -4498,7 +4498,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 476853746f5d0545efd30f38cfb4099ce54cfc2f..91a37be827633ba05bb4df7d718ac3b8dd1d241a 100644 (file)
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -4885,7 +4885,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index a40c9a890e00990d521aa02ffcc2bf94361700e7..fbc5e8cb91a58018b32484cca3a4dc9cf320feb2 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3863,7 +3863,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/README b/etc/README
index d8ca8a7b9472413bee86970037b8c5d78c8b7c38..05e1e63d8d5297b9e7ff2fcc9c57fefb0000c278 100644 (file)
--- a/etc/README
+++ b/etc/README
@@ -40,7 +40,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/TERMS b/etc/TERMS
index 926d6130aaee20d464038316b05d9fb2a8659f78..c26c38ab6e4aafab1082b8cab2b563d8e86b694b 100644 (file)
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -237,8 +237,8 @@ COPYING PERMISSIONS:
 
     This document is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -246,5 +246,6 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.

diff --git a/etc/TODO b/etc/TODO
index 50fb4a19484cf5974fe4155cbd6ff7b969d775f8..c81b82dd54af078d9bf3fd99d0f509f3ad87d432 100644 (file)
--- a/etc/TODO
+++ b/etc/TODO
@@ -605,7 +605,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/TUTORIAL b/etc/TUTORIAL
index d842870975ee3b1d786e656b645e6d95a8dc4b00..eaa976197637854215aab5568d0bdb6b8352cb6e 100644 (file)
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -1111,7 +1111,7 @@ and comes with permission to distribute copies on certain conditions:
   
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
   
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/calccard.tex b/etc/calccard.tex
index dec07c4705dbc13f597bff16fd57c7cbd1f43c1c..f2f033cc7e1fd588aa326abfe943cf3e394f0ee5 100644 (file)
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -20,7 +20,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/compilation.txt b/etc/compilation.txt
index 933b486bb0fa204c77cc58eb8d099c7934bd3d11..c35ab96dcb58af0d034620f59dd00e226cae6534 100644 (file)
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -413,8 +413,8 @@ COPYING PERMISSIONS:
 
     This document is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -422,5 +422,6 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.

diff --git a/etc/cs-dired-ref.tex b/etc/cs-dired-ref.tex
index e78bf29b97300dd7718bd8c5721263c67aaf246c..c936ab0eedf05a112d2c8411d787fcd597c8fec8 100644 (file)
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -9,7 +9,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex
index 9b5b689f66d9f2c933d8fd9a91e6a466a4398de7..c9742eed0ebabadfc08da1adbfbc0ff7ce230525 100644 (file)
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -18,7 +18,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/cs-survival.tex b/etc/cs-survival.tex
index 20a881184813e1b27771678eb8dd6fc67adaf3f6..25f2786103f8e496d8add8e02efc59cd65084a9f 100644 (file)
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -28,7 +28,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/de-refcard.tex b/etc/de-refcard.tex
index 94f9bf0dc47436960f0893498dc94f3ba7e58b1c..76de0410b52b71e0f9bbbfefb8ffdc4bee25f54b 100644 (file)
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -30,7 +30,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index 061c1415ec29ee1d9583a5018c104bc88434dae9..45c1e8fc14fc85dedb5506e355083f84e9874ff8 100644 (file)
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -6,7 +6,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/edt-user.doc b/etc/edt-user.doc
index c99bb83a364f148dfc134b612009236e2bd13b31..d4aaab8b4922d34991e8557d35fb9517e3b99790 100644 (file)
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -13,7 +13,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3, or (at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
@@ -832,7 +832,7 @@ G-C-\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 6a6a73ca0b63c16cae45e8f0567a1f31ff85e2bc..76586e2aff772ccbba384878d864ad13431d3caf 100644 (file)
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -13,7 +13,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/emacs.1 b/etc/emacs.1
index daee15b23888c1101d37f41c3e6b75ea53ffbd65..87a382272c548e0f59dae94161c70add6f8b9b58 100644 (file)
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -6,7 +6,7 @@
 .\"
 .\" GNU Emacs is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2, or (at your option)
+.\" the Free Software Foundation; either version 3, or (at your option)
 .\" any later version.
 .\"
 .\" GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/emacs.bash b/etc/emacs.bash
index 2589c784a875f54c53ea8dcd448e0f56e48d3e39..c207e5ffe9e114b83bacb5e0fb8dd69a3c935c22 100644 (file)
--- a/etc/emacs.bash
+++ b/etc/emacs.bash
@@ -9,7 +9,7 @@
 
 ## GNU Emacs is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/emacs.py b/etc/emacs.py
index 0d0f2e75ed38545c62cba6a5c8a3a90714fb0c18..f11913cd7b59a0e7272010c728a96b0308fd419b 100644 (file)
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -7,7 +7,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/enriched.doc b/etc/enriched.doc
index 25b034434ad690852761d6fd856b16e20274833e..50dcf0bdac420959ff8f5849b799a82655312fa0 100644 (file)
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -263,8 +263,8 @@ COPYING PERMISSIONS:
 
     This document is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -272,6 +272,6 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.

diff --git a/etc/fr-drdref.tex b/etc/fr-drdref.tex
index 9ae872b99d2932cc86cf27fe2aeb35983f66bd9c..e768a5212033e5d30ad4e80bef872f8f2d1e428c 100644 (file)
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -6,7 +6,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index 1e399334b909f095315bd32a65324696d5c0e8d5..202f5d483d2e7af0389242c897549c73c3d1d02c 100644 (file)
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -21,7 +21,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/fr-survival.tex b/etc/fr-survival.tex
index ce3382191284837ca9c3327a0f16017cf0e2114e..e39f23bf05b60e6f587c3c76a6ceeee34bbd5078 100644 (file)
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -29,7 +29,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 0505b49f10bc7d7450529f25fdb1cbe84dd6d2c3..9e7ff793d7301d5798d2a379143c75b15be41ac5 100644 (file)
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -34,7 +34,7 @@ heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 55a797000c6221dfcd5927e27301d754fc407a3b..1207fadc76bf6eea449bfdd870c314b93abe1a5d 100644 (file)
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -25,7 +25,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index 2f55402aa3d6b886d10eacbbc252a743c02f5f61..43f583b8e75c62183fc7d7b2e7a956b0dab8c14e 100644 (file)
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -39,7 +39,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index ffa7d39dfe7c362fb4a2ee827ae05bc7a96c9dd8..97c396993cd692243e2fdf89f9aa8fac11f6473a 100644 (file)
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -8,7 +8,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 977b2e91f157c2faf4d33e659d56cfa1e7fe393c..15fe022ed76aa3ce3e9c92541dcfbfad48a11e79 100644 (file)
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -8,7 +8,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/pt-br-refcard.tex b/etc/pt-br-refcard.tex
index 945fce4e47ac672714189bb1d4e20afb9b927e2c..6492ce55c102152bbb5c9dc50d6636da7a2e4e4f 100644 (file)
--- a/etc/pt-br-refcard.tex
+++ b/etc/pt-br-refcard.tex
@@ -21,7 +21,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/refcard.tex b/etc/refcard.tex
index 7f7784bc9578b33d8dfe83c9e26a417de1fec4b0..9ee88261ca59c842b317c6c45e2a92e1ddb0f4b8 100644 (file)
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -21,7 +21,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index 3cbeb587b194c91e4d44cd623c0babcd3955a96a..6155483e29dc1ee68dea9e54899937ae3a4d9cb8 100644 (file)
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -213,8 +213,8 @@ Sales summary - Acme fundraising
 ;;; 
 ;;;   This document is free software; you can redistribute it and/or modify
 ;;;   it under the terms of the GNU General Public License as published by
-;;;   the Free Software Foundation; either version 2 of the License, or
-;;;   (at your option) any later version.
+;;;   the Free Software Foundation; either version 3, or (at your option)
+;;;   any later version.
 ;;;
 ;;;   This program is distributed in the hope that it will be useful,
 ;;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -222,8 +222,8 @@ Sales summary - Acme fundraising
 ;;;   GNU General Public License for more details.
 ;;;
 ;;;   You should have received a copy of the GNU General Public License
-;;;   along with this program; if not, write to the Free Software
-;;;   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+;;;   along with this program; see the file COPYING.  If not, write to the 
+;;;   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+;;;   Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765

diff --git a/etc/sk-dired-ref.tex b/etc/sk-dired-ref.tex
index fbc8f4cdd4965c661bf5b3c798283ea82c779e84..e00de765241bb41911063ee8c16ca091f69b3c19 100644 (file)
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -9,7 +9,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex
index 1182e50b82da1efc78727ab869a232f3dad4f860..be5b57b84055d674b4d1be8bceb7875c522228e5 100644 (file)
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -18,7 +18,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/sk-survival.tex b/etc/sk-survival.tex
index 658e501b0631bc6979643772ce10e2a7331dfb7f..61d549e1b5b556bec6cf8090cd166e055496be28 100644 (file)
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -28,7 +28,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/splash.xpm b/etc/splash.xpm
index 85171f30725ebfb004d39f4323057a8604e0153d..741deeac31c74c9efab075c8f92a4610c6a54cad 100644 (file)
--- a/etc/splash.xpm
+++ b/etc/splash.xpm
@@ -10,7 +10,7 @@
  *
  * GNU Emacs is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/splash8.xpm b/etc/splash8.xpm
index 236d07c6a1c20f1072e986436dfeffb7440b82f3..1c209585739e2afa81ee0fb5e36a745fd6ecce99 100644 (file)
--- a/etc/splash8.xpm
+++ b/etc/splash8.xpm
@@ -10,7 +10,7 @@
  *
  * GNU Emacs is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * GNU Emacs is distributed in the hope that it will be useful,

diff --git a/etc/survival.tex b/etc/survival.tex
index 59583430896092f70d85f9d6b02ecb3d7d00b736..45662ecc4eac3b76027dcfd44ec4ddc5cbd69273 100644 (file)
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -32,7 +32,7 @@
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,